Use debhelper-compat 12

diff --git a/debian/changelog b/debian/changelog
index 773e962a35decc5e5875ed3c254b478579eca1b5..4764f79021e0581c92319c54847e8cd016a97f37 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ ostree (2019.2-2) UNRELEASED; urgency=medium
       can't reproduce and debug the failure in a local Docker container.
     - Similarly, disable the autopkgtest for now.
   * Standards-Version: 4.4.0 (no changes required)
+  * Use debhelper-compat 12
+    - Override dh_installsystemd instead of dh_systemd_start
+    - Stop overriding libexecdir
 
  -- Simon McVittie <smcv@debian.org>  Sun, 23 Jun 2019 20:07:33 +0100
 

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10

diff --git a/debian/control b/debian/control
index 6fb0655e034fd71dc304b5e6fca25dd791fa78d2..85b318d9ec36f5e3cda1e85ade0dc62f190e9a7e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  bison,
  ca-certificates,
  cpio,
- debhelper (>= 10~),
+ debhelper-compat (= 12),
  dh-exec (>= 0.23~),
  docbook-xml <!nodoc>,
  docbook-xsl <!nodoc>,

diff --git a/debian/rules b/debian/rules
index 792905fc04341bfe6dfa95025167882df890c7cf..021b1e8a7f954aad41579ce5a007ca96ccfa7e13 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,6 @@ override_dh_autoreconf:
 configure_options = \
        GJS=some-nonexistent-gjs-binary \
        --enable-installed-tests \
-       --libexecdir='$${prefix}/libexec' \
        --with-avahi \
        --with-dracut \
        --with-grub2 \
@@ -99,5 +98,5 @@ override_dh_fixperms-arch:
        find debian/tmp -type f -name '*.js' -print0 | \
                xargs -0r chmod -v go=rX,u+rw,a-s
 
-override_dh_systemd_start:
-       dh_systemd_start --no-start
+override_dh_installsystemd:
+       dh_installsystemd --no-start